From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Fri, 4 Apr 2025 14:33:56 +0000 (+0200)
Subject: we must not use QFile::remove that may fail on windows read-only files
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2^2~48^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bf1a13913a5f378f70eed3063c35bf69da2477c4;p=nextcloud-desktop.git

we must not use QFile::remove that may fail on windows read-only files

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/conflictsolver.cpp b/src/gui/conflictsolver.cpp
index 780e4087b..5292d48e3 100644
--- a/src/gui/conflictsolver.cpp
+++ b/src/gui/conflictsolver.cpp
@@ -95,7 +95,7 @@ bool ConflictSolver::deleteLocalVersion()
     if (FileSystem::isDir(_localVersionFilename)) {
         return FileSystem::removeRecursively(_localVersionFilename);
     } else {
-        return QFile(_localVersionFilename).remove();
+        return FileSystem::remove(_localVersionFilename);
     }
 }